Reverted Mark's change. The refcount is private information, and the

2000-04-01  Federico Mena Quintero  <federico@helixcode.com>

	* gdk-pixbuf/gdk-pixbuf.c: Reverted Mark's change.  The refcount
	is private information, and the art_pixbuf will go away soon.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 4fe3979162fdd07ea65a397b337bdcca0f93bb5c..5a5508e2b091f81ea2ee60483ea849aa7071fdc3 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-01  Federico Mena Quintero  <federico@helixcode.com>
+
+       * gdk-pixbuf/gdk-pixbuf.c: Reverted Mark's change.  The refcount
+       is private information, and the art_pixbuf will go away soon.
+
 2000-03-31  Mark Crichton  <crichton@gimp.org>
 
        * gdk-pixbuf/gdk-pixbuf.c: Added gdk_pixbuf_get_refcount

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 65dece8ac4a03f1ce50cfed4761fa2372015a17e..1c7162267aa08de8971c8bd2a00d176fe6cc3399 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -295,40 +295,7 @@ gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf)
        return pixbuf->art_pixbuf->rowstride;
 }
 
-/**
- * gdk_pixbuf_get_ref:
- * @pixbuf: A pixbuf.
- *
- * Gets the refcount of a pixbuf.
- *
- * Return value: The refcount of the @pixbuf argument.
- **/
-gint
-gdk_pixbuf_get_ref (GdkPixbuf *pixbuf)
-{
-        g_return_val_if_fail (pixbuf != NULL, -1);
-        g_return_val_if_fail (pixbuf->ref_count > 0, -1);
-
-        return (pixbuf->ref_count);
-}
-
-/**
- * gdk_pixbuf_get_artpixbuf:
- * @pixbuf: A pixbuf.
- *
- * Queries a pointer to the ArtPixBuf data of a pixbuf.
- *
- * Return value: A pointer to the pixbuf's ArtPixBuf.
- **/
-ArtPixBuf *
-gdk_pixbuf_get_artpixbuf (GdkPixbuf *pixbuf)
-{
-        g_return_val_if_fail (pixbuf != NULL, NULL);
-        g_assert (pixbuf->art_pixbuf != NULL);
-
-        return pixbuf->art_pixbuf;
-}
-
+\f
 
 /* General initialization hooks */
 const guint gdk_pixbuf_major_version=GDK_PIXBUF_MAJOR,

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index ff64b7a19c03dc52c44555e6e00a35903ce63850..01f2043bfc20318e4487b2a6480249304ede31a2 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -94,9 +94,6 @@ guchar      *gdk_pixbuf_get_pixels          (GdkPixbuf *pixbuf);
 int          gdk_pixbuf_get_width           (GdkPixbuf *pixbuf);
 int          gdk_pixbuf_get_height          (GdkPixbuf *pixbuf);
 int          gdk_pixbuf_get_rowstride       (GdkPixbuf *pixbuf);
-gint         gdk_pixbuf_get_ref             (GdkPixbuf *pixbuf);
-ArtPixBuf   *gdk_pixbuf_get_artpixbuf       (GdkPixbuf *pixbuf);
-
 
 /* Reference counting */